package demo;

public class HelloWorld {

    public static void main(String[] args) {
        System.out.println("hello world!");
        System.out.println("在分支1上修改了内容!!");
        System.out.println("主线上添加了新内容!");
        System.out.println("分支1上添加了新内容!!!");
    }
}











